[checkmk-commits] Check_MK Git: check_mk: ChangeLog: fixed merge conflict