HCOLL-163  fixed some merge issues.