Removed git merge markers