Fix scrolling and merge issues