Update travis
Fix merge conflicts