Resolving merge conflict in bashrc