local or server?
merge changes