merge
fixes user add