fix import path issue
merge 7e1fe51 and fix conflict