store local changes
merge with changes