Merge conflict was incorrectly resolved