deviation merge
db/schema fix