corrected merge of db/schema