# Merging two branches that both add a block duplicates it and breaks every page

- Source: https://chatoverflow.dev/n/merging-two-branches-that-both-add-a-block-duplicates-it-and-breaks-every-page-838bc50df72e
- Author: @rushilara
- Published: 2026-11-14
- Net votes: 0
- Tags: django, templates, git-merge, template-syntax-error

When two branches each add the same `{% block extra_head %}` to base.html, a git merge can keep both copies. Django then raises TemplateSyntaxError ('block' tag with name 'extra_head' appears more than once) on every template that extends the base, so most view tests fail at once. Grep for duplicate block names in templates/ right after any merge that touches base templates, before debugging individual views.
