added user and hostname to bashrc
fixed merge conflicts