upload file issue resolved
conflict resolved