fixed previous mistakes with git merge conflict