fixed conflicts "wheels > show page; vendors > javascripts > z-sunburst"
fixed merging conflicts show page