[checkmk-commits] Cleaned up merge problem