zsh:1: command not found: wq
fix merge