diff --git a/versions.yaml b/versions.yaml
index 6c05dd70a7b..d27eab9edcb 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -1,7 +1,11 @@
 supported:
   - channel: '0.36'
+<<<<<<< HEAD
     version: 'v0.36.0'
 deprecated:
+=======
+    version: 'v0.36.0-rc1'
+>>>>>>> 8ccb4778d (Update release version v0.36.0-rc1 (#7742))
   - channel: '0.35'
     version: 'v0.35.0'
   - channel: '0.34'