.travis conflicts fixed