code review
code review: comments on code & users controller spec
resolve conflict