Autoscroll to the first conflict.
Merge pull request #35 from smashwilson/autoscroll

Autoscroll to the first conflict.