Maybe this should be another numbered point under the previous points. If a PR does not apply cleanly to one of its targeted branches, then another PR should be created that does.