Try to resolve adding_users conflict
Merge branch 'adding_users'