delete max height for max to disable scroll
last change to disable scroll
merged syntax conflict
Merge branch 'disabling-scroll'