Center conflict markers when you jump.
Merge pull request #34 from smashwilson/center-conflicts

Center conflict markers when you jump.