Updated Users to reflect our needs
Merge conflict fix.