Git keeps telling me about MERGE_HEAD problems and won't let me commit, trying again..