merging changes