adding user controller
Fixed merge conflict.
fixed merge conflict in the application controller.