Adding main template
Fixing conflicts