Adding modal template
Merging