Update import method
Fix problem
Fixed conflicts