user image show in makes/visits link,gems taken out of development
solving merge conflicts
merge conflict