fixing git merge error