fix import.rb conflicts