merge travis better