fix merge conflict, travis ci build failing because of css error