Fixed merge conflict with users