local changes
merge
before migrations
uploading with local changes