added my bashrc
merged conflict