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