New bash prompt format
Fix conflict