Removed git merge conflict