Enabled auto-detection of file type
Fixed upload conflict