user controller review
conflict fixed and user views cleanded