Attempt to correct loading forked cli tools
resolved conflict