fix merge failure
fix assertion firing and consequently fix examples/example-0031-row-span.html update on clicking 'change row height' button.
fix bad assert test statement