File donwload now added
Conflict fixed