height adjustment now dynamic on scroll
fix merge