made minor changes and some added functionality to resources
handled merge conflict with User