This commit and next resolve conflicts with the aforementioned merge possible unstashed new files have slipped through to p-m branch with these commits
This commit and next resolve conflicts with the aforementioned merge possible unstashed new files have slipped through to p-m branch with these commits