Removed git merge-conflict lines