MERGE ALL CONFLICTS LIKE A BAUSE