Resolve travis merge conflict