Merge pull request #2170 from TheBlueMatt/2023-04-silent-merge-conflict