adding some new files
new request path
fixing merge confilicts
small fix