resolve autotest/discover.rb file conflict