Remove Conflicts
Merge branch 'theme_development'