Get users working
Fixed merge error