Wrong travis config merge has been fixed