Resolved template missing conflict