(scroll-bar-mode -1)
fix merge conflict