MergeConflict KILLED