MergeFix op DiffCreator