made users work
made users work
fixed merge