added DMMerger; changed method to force a merge conflict