docs(changes): drop leftover diff3 base markers from the O6 dev merge