Update MergeConflicts + its patch