fix(travis): Rebase