Fix indenting in 'visit'. Use only one template file at a time, don't look for the same filename in subcollections.
Fix automerge conflict.