add user functionality to project
resolved connflicts