Ch33 fix2

resolve conflict. otw +1