modification to start travis
fix merge