migrated database
updated database
changes
fixed merge conflicts