claen up users
fix correct user
merge