fixing git merge problems