Manually removed my uncommitted changes since git couldn't do it itself.