fixed merge issue

wow painful shell stuff