Fixed a stray merge conflict in scroller