simplifed merge process