Hotfix filetransfert
Resolve conflicts