deleted viewusers.html.erb because it has been changed to view_users.html.erb
Fixing conflicts
Fixing conflicts