another method of preventing scroll which may work
Merge remote-tracking branch 'origin/master'