Create template: Cleanup merge