idea: textobjects for jj conflicts

- conflict markers - unified diff markers