File import : first draft, not working
Fix merge conflicts