clean conflicts after puppet has run
authored
by
This makes it so it has a chance of upgrading config files that might have changed after bullseye. It will not necessarily remove the conflict files, but will make the cleanup certainly easier. In fact, we could also fix clean_conflicts to automatically resolve those as well.