Resolves conflicts in tmux.conf and pryrc