changed user number position
merge conflict solved