Fixed git's merge problems