resolved db/schema conflict