agenda
merge
zsh:1: command not found: q

Conflicts:
	english.html
	index.html