[checkmk-commits] Check_MK Git: check_mk: merge conflict in changelog