scrollbars and other large conflict improvements