resolving merge conflicts

playbooks/edx-west/cme-prod-app.yml

@@ -33,10 +33,11 @@
   roles:
     - common
     - role: nginx
+      nginx_conf: true
       nginx_sites:
       - lms
       - cms
       - lms-preview
-    - {'role': 'edxapp', 'openid_workaround': true}
+    - {'role': 'edxapp', 'openid_workaround': true, 'template_subdir': 'cme'}
     # run this role last
     # - in_production

playbooks/edx-west/prod-ora.yml

 # this gets all running prod webservers
 #- hosts: tag_environment_prod:&tag_function_ora
 # or we can get subsets of them by name
-- hosts: ~tag_Name_ora(10|11)_prod
+#- hosts: ~tag_Name_ora(10|11)_prod
+- hosts: ~tag_Name_ora10_prod
+#- hosts: ~tag_Name_ora11_prod
 #- hosts: security_group_edx-prod-EdxappServerSecurityGroup-NSKCQTMZIPQB
   sudo: True
   vars: