update
removing tables and editing models for sync
adding deleted files
resolving conflicts