HCOLL-240 fixed merge issues