Merging the changes