user auth
fix conflicts
fix delete file
fix more errors