Get rid of all the Git merge crap