merge conf reslove

This commit is contained in:
Dennis Boekholtz 2024-04-13 23:17:47 +02:00
commit bb79053b1e