first add MergeConflict