[checkmk-commits] Fixed merge bug.