working on user information put
merge fix