Fixing git merge errors