removed git merge conflicts