aMERGED CONFLICT