Remove weird git merge text