Removed git merge lines