The easiest way to solve this would be to delete local master and checkout origin master. That way you would have a healthy master you can use to branch from it and start clean.