Highlight, navigate and resolve conflict markers