merging chages