add bashrc and profile
resolve merge conflict