diff --git a/1co/04/intro.md b/1co/04/intro.md
index e93c0695af..885f05b2aa 100644
--- a/1co/04/intro.md
+++ b/1co/04/intro.md
@@ -2,11 +2,7 @@
 
 #### Structure and formatting ####
 
-<<<<<<< Updated upstream
-Some translations prefer to set apart quotations of the Old Testament. The ULB and many other English translations indent the Old Testament quotation in 4:6.
-=======
 Some translations set apart quotations of the Old Testament by indenting them. The ULB and other English translations indent the words in 4:6 that are quoted from the Old Testament.
->>>>>>> Stashed changes
 
 #### Special concepts in this chapter ####
 
diff --git a/1co/05/intro.md b/1co/05/intro.md
index 4afb7a5744..63646f7745 100644
--- a/1co/05/intro.md
+++ b/1co/05/intro.md
@@ -2,11 +2,7 @@
 
 #### Structure and formatting ####
 
-<<<<<<< Updated upstream
-Some translations prefer to set apart quotations of the Old Testament. The ULB and many other English translations indent the last line of 5:13, which is a quotation from the Old Testament. 
-=======
 Some translations set apart quotations of the Old Testament by indenting them. The ULB and other English translations indent the words in 5:13 that are quoted from the Old Testament.
->>>>>>> Stashed changes
 
 #### Important figures of speech in this chapter ####
 
diff --git a/1co/08/intro.md b/1co/08/intro.md
index 5e77d4122b..62c6ff8e2a 100644
--- a/1co/08/intro.md
+++ b/1co/08/intro.md
@@ -2,11 +2,7 @@
 
 #### Structure and formatting ####
 
-<<<<<<< Updated upstream
-Chapters 8-10 form a single unit, answering the question: "Is it acceptable to eat meat that has been sacrificed to an idol?"
-=======
 Chapters 8-10 form a single unit that answers the question: "Is it acceptable to eat meat that has been sacrificed to an idol?"
->>>>>>> Stashed changes
 
 #### Special concepts in this chapter ####