Update scroll monitor version
Fix merge conflicts