Missing merge conflict