travis fix after rebase