added users
added user views
fixed conflicts