removed git merge conflict garbage