had forgotten a merge conflict