Add functionality to users table
Fix conflicts