new site theme
merge conflict