update to merge