IMP: use the `diff3` conflict style, should make forward port conflicts clearer and easier to fix