trying again to merge