Cache templates
Resolve conflicts