Merge "Change "$>" to "$" as CLI prompt"