docs/src/Master*: fix merge errors