fixed issues with git merge