docs(changelog): drop the diff3 base marker left by the dev merge