Adding better navigation for git conflicts's markups

Thx @phcostabh