Compile the theme to resolve local merge conflict