Add alias for SN cookbooks
Add env var for git merge autoedit