From 65eb10ef58b418922ab6f0f5bef5446247fe0a14 Mon Sep 17 00:00:00 2001
From: Software Engineer <mike@swisstronik.com>
Date: Tue, 23 Jul 2024 13:23:56 +0200
Subject: [PATCH] Revert "Chore/resolve master conflicts (#118)" (#120)

This reverts commit f784b7a46af33185be5939953807f4458fa08208.