B-0 fixed merge issue