chore(travis): git merge