fixed stock display
merge