we cross-merge the branches, not the doc fixes