Remove stupid git merge text