Remove  a bug in _upload.php
Resolved conflicts
Resolving conflicts
Resolving conflicts