user show page change
merge fix