Merging all changes