users MVC
resolved conflict