Clean-up

.github/ISSUE_TEMPLATE.md

@@ -18,12 +18,12 @@ For example:
 
 
 ```markdown
-Who was the chief commander of Saul's army? (this is the text of the tW page)
+Who was the chief commander of Saul’s army? (this is the text of the tW page)
 
-Who was the **head leader** of Saul's army? (this is a suggested change - with the suggestion in bold)
+Who was the **head leader** of Saul’s army? (this is a suggested change - with the suggestion in bold)
 ```
 
 **We really appreciate your help in making the resources the best they can be!**
 
 
-(You can replace all of the above text with your suggestions.)
+(You can replace all of the above text with your suggestions.)

README.md

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 <img src=”https://cdn.door43.org/assets/uw-icons/logo-utq-256.png” alt=”UTQ Logo” width=”100”/>
+=======
+<img src="https://cdn.door43.org/assets/uw-icons/logo-utq-256.png" alt="UTQ Logo" width="100"/>
+>>>>>>> master
 
 # unfoldingWord® Translation Questions
 

manifest.yaml

@@ -24,12 +24,20 @@ 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'
@@ -39,11 +47,19 @@ 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: