merge all changes