fixed merge broken-ness