Changed highlighting of conflict markers