fixing the mess git merge created