users complete
Fixed merge conflicts