diff --git a/README.md b/README.md
index bfa860345..78f317737 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-
-=======
->>>>>>> master
# unfoldingWord® Translation Questions
diff --git a/manifest.yaml b/manifest.yaml
index 724ba8b98..8a90f102e 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -24,20 +24,12 @@ dublin_core:
description: 'Comprehension and theological questions for each chapter of the Bible. It enables translators and translation checkers to confirm that the intended meaning of their translations is clearly communicated to the speakers of that language.'
format: 'text/tsv'
identifier: 'tq'
-<<<<<<< HEAD
- issued: '2021-04-08'
-=======
issued: '2021-05-10'
->>>>>>> master
language:
direction: 'ltr'
identifier: 'en'
title: 'English'
-<<<<<<< HEAD
- modified: '2021-04-08'
-=======
modified: '2021-05-10'
->>>>>>> master
publisher: 'unfoldingWord'
relation:
- 'en/ult'
@@ -47,19 +39,11 @@ dublin_core:
-
identifier: 'tq'
language: 'en'
-<<<<<<< HEAD
- version: '21'
- subject: 'TSV Translation Questions'
- title: 'unfoldingWord® Translation Questions'
- type: 'help'
- version: '22'
-=======
version: '22'
subject: 'Translation Questions'
title: 'unfoldingWord® Translation Questions'
type: 'help'
version: '23'
->>>>>>> master
checking:
checking_entity: