little refactoring
fix conflicts import_legacy