doing user add things
merge