From 8a8172cd74a02b0168829a5ce35a068ba99656af Mon Sep 17 00:00:00 2001
From: Michael Chung <6252325+ArEnSc@users.noreply.github.com>
Date: Thu, 13 Jun 2024 01:12:52 -0400
Subject: [PATCH] Fix README

---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index 3b29014bc1..b9194db895 100644
--- a/README.md
+++ b/README.md
@@ -40,15 +40,9 @@ If you can use chat gpt to create the interface.
 
 - `studio-testing` - The testing branch.
 
-<<<<<<< HEAD
 Anyone can push their changes to this branch for testing in a production-like environment. Since it is built and hosted on https://studio-testing.studio.storyteller.ai ,
 you won't face CORS issues, same-site cookie issues, or have to use a local development proxy. (This doesn't obviate the need for a development
 proxy for fast development iteration, but is a fantastic way to test your changes in a "production-like" environment.)
-=======
-Anyone can push their changes to this branch for testing in a production-like environment. Since it is built and hosted on https://studio-testing.studio.storyteller.ai ,
-you won't face CORS issues, same-site cookie issues, or have to use a local development proxy.
-
-> > > > > > > f4a06fca (Update README.md)
 
 Force push to this branch by using `git push -f origin studio-testing`