[CB,HB]{oter} fixed merge issues