fix htaccess
fix upload-file
fix conflict