Git got screwed up, getting my changes in