Modified users file
Fixed merge issue