Fixed merge conflict for {% csrf_token %}