Fix problem with incorrect arg order to MergeConflicted