Give editor focus and go to line 2
Merge remote-tracking branch 'enderandpeter/focus'
Go to line 3
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into options