todo improved diff and conflict markers walks