fix indentation
attempt to fix travis file
FIC CONFLICT MERGE