fixing a bad merge comment in the travis config