On Sun, 20 Feb 2022, John Schneider wrote:
I spent some time on this today and realized when running mergemaster, I accidentally skipped over a file related to wpa_supplicant. After updating it, everything is working fine.
Glad to hear it works and we don't have to chase further :-) Joyful times, Bjoern -- Bjoern A. Zeeb r15:7