.
resolved local merge conflict in schema.db