[checkmk-commits] [tribe29/checkmk] 94ad27: untangle conflicts check and kept files list