Merging all the changes.