Added user Role entity
Fixed merged conflicts