Changes in template
Conflict Resolved