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