missed a bracket in git merge