Added right click to jump to conflict