Start scrolling 3 lines before the border
Merge remote-tracking branch 'origin/master'

Conflicts:
	[resolved] vim/vimrc