automatic save
merge changes
automatic save