#container height
merge fix