Added new theme template
merge conflict resolution
merge conflict