Fix syntax errors which were probably caused by the git mergetool