Creating template
Merge conflict resolution