Fixing merge issues
Fixing merge issues
Updated bashrc for root prompt