Test another conf for travis
Resolve confclits