Updating db/schema after merge