changes to merge