diff --git a/openpype/hosts/maya/api/lib_rendersettings.py b/openpype/hosts/maya/api/lib_rendersettings.py
index 10b94c324f..91dde16db3 100644
--- a/openpype/hosts/maya/api/lib_rendersettings.py
+++ b/openpype/hosts/maya/api/lib_rendersettings.py
@@ -29,11 +29,7 @@ class RenderSettings(object):
     _image_prefixes = {
         'vray': get_current_project_settings()["maya"]["RenderSettings"]["vray_renderer"]["image_prefix"], # noqa
         'arnold': get_current_project_settings()["maya"]["RenderSettings"]["arnold_renderer"]["image_prefix"],  # noqa
-<<<<<<< HEAD
         'renderman': get_current_project_settings()["maya"]["RenderSettings"]["renderman_renderer"]["image_prefix"],  # noqa
-=======
-        'renderman': '<Scene>/<layer>/<layer>{aov_separator}<aov>',
->>>>>>> develop
         'redshift': get_current_project_settings()["maya"]["RenderSettings"]["redshift_renderer"]["image_prefix"]  # noqa
     }
 
diff --git a/vendor/configs/OpenColorIO-Configs b/vendor/configs/OpenColorIO-Configs
new file mode 160000
index 0000000000..0bb079c08b
--- /dev/null
+++ b/vendor/configs/OpenColorIO-Configs
@@ -0,0 +1 @@
+Subproject commit 0bb079c08be410030669cbf5f19ff869b88af953