Merge all changes