Fix travis error
Conflict