Modified .bashrc to make propmt display IP and branch name
Resolved git conflict