[checkmk-commits] [tribe29/checkmk] 1e3934: untangle conflicts check and kept files list