Merge the change