Testing merging
Adds merging dialog for zshrc