testing merging for zshrc