travis
fixed merge confict in db:schema