Some merge conflict bugs