changes merging