diff --git a/tn_DEU.tsv b/tn_DEU.tsv
index aafbd0c29c..71cba051c2 100644
--- a/tn_DEU.tsv
+++ b/tn_DEU.tsv
@@ -2024,16 +2024,8 @@ front:intro	rm3n				0	# Introduction to Deuteronomy\n\n## Part 1: General Introd
 19:20	lv0h			כַּ⁠דָּבָ֥ר הָ⁠רָ֛ע הַ⁠זֶּ֖ה	1	Alternate translation: “such an evil thing as this”
 19:21	z5fm		rc://*/ta/man/translate/figs-idiom	וְ⁠לֹ֥א תָח֖וֹס עֵינֶ֑⁠ךָ	1	Here, **your eye shall not pity him** is an idiom that means “do not feel sorry for him.” If this phrase does not have that meaning in your language, you could use an idiom from your language that does have this meaning or state the meaning plainly. Alternate translation: “And do not let your heart soften towards him” or “And do not have compassion on him”
 19:21	nz4x		rc://*/ta/man/translate/figs-explicit	נֶ֣פֶשׁ בְּ⁠נֶ֗פֶשׁ עַ֤יִן בְּ⁠עַ֨יִן֙ שֵׁ֣ן בְּ⁠שֵׁ֔ן יָ֥ד בְּ⁠יָ֖ד רֶ֥גֶל בְּ⁠רָֽגֶל	1	The implication is that the punishment for a sin must be as severe as the harm that the sinner caused. For example, if someone takes *a life** through murder, then they must lose their **life** through execution. You could include this information if that would be helpful to your readers. Alternate translation: “someone who takes a life must lose their life, someone who gouges out an eye must lose their eye, someone who knocks out a tooth must lose a tooth, someone who cuts off a hand must lose a hand, and someone who cuts off a foot must lose a foot”
-<<<<<<< HEAD
-20:intro	qq8m				0	# Deuteronomy 20 General Notes\n\n## Structure and Formatting\n\n### Outline\n- vv. 1-20: Instructions for going to war.\n\n## Special concepts in this chapter\n\n### Yahweh’s protection\nIsrael was not to worry about the power and strength of other nations. Instead, they were to trust in the power of Yahweh. He is the source of their military strength and protection. This is why a priest leads them into battle, rather than a military commander. (See: [[rc://*/tw/dict/bible/kt/trust]] and [[rc://*/tw/dict/bible/kt/priest]])\n\n### Holy war\n\nIsrael’s conquering of the Promised Land was unique in history. It was a type of holy war and had special rules. This war was really Yahweh’s punishment against the sin of the Canaanite people. If the people were not completely destroyed, they would cause Israel to sin. (See: [[rc://*/tw/dict/bible/kt/promisedland]] and [[rc://*/tw/dict/bible/kt/holy]] and [[rc://*/tw/dict/bible/kt/sin]])\n\n## Important figures of speech in this chapter\n\n### “What man is there”\nThis phrase is used several times to introduce a rhetorical question. The questions are intended to tell the readers that Yahweh only wants soldiers who are completely dedicated to fighting for him. (See: [[rc://*/ta/man/translate/figs-rquestion]])\n\n##### Excused from fighting\n\nIn ancient Israel, men were excused from fighting in battle for several different reasons. Some of these reasons are mentioned in this chapter. Apparently, needing to establish a new house, the need to harvest a field and cowardice were possible excuses. (See: [[rc://*/ta/man/translate/figs-explicit]])\n\n## Other possible translation difficulties in this chapter\n\n
-20:1	r5j1		rc://*/ta/man/translate/figs-explicit	וְֽ⁠רָאִ֜יתָ ס֤וּס וָ⁠רֶ֨כֶב֙	1	The implication is that an army with **horses and chariots** was a very strong army, so anyone who was fighting that army would be afraid. You could include this information if that would be helpful to your readers. Alternate translation: “and see a strong army with horses and chariots”\n
-||||||| 71cfc507bf
-20:intro	qq8m				0	# Deuteronomy 20 General Notes\n\n## Structure and Formatting\n\n### Outline\n- vv. 1-20: Instructions for going to war.\n\n## Special concepts in this chapter\n\n### Yahweh’s protection\nIsrael was not to worry about the power and strength of other nations. Instead, they were to trust in the power of Yahweh. He is the source of their military strength and protection. This is why a priest leads them into battle, rather than a military commander. (See: [[rc://*/tw/dict/bible/kt/trust]] and [[rc://*/tw/dict/bible/kt/priest]])\n\n### Holy war\n\nIsrael’s conquering of the Promised Land was unique in history. It was a type of holy war and had special rules. This war was really Yahweh’s punishment against the sin of the Canaanite people. If the people were not completely destroyed, they would cause Israel to sin. (See: [[rc://*/tw/dict/bible/kt/promisedland]] and [[rc://*/tw/dict/bible/kt/holy]] and [[rc://*/tw/dict/bible/kt/sin]])\n\n## Important figures of speech in this chapter\n\n### “What man is there”\nThis phrase is used several times to introduce a rhetorical question. The questions are intended to tell the readers that Yahweh only wants soldiers who are completely dedicated to fighting for him. (See: [[rc://*/ta/man/translate/figs-rquestion]])\n\n##### Excused from fighting\r\n\r\nIn ancient Israel, men were excused from fighting in battle for several different reasons. Some of these reasons are mentioned in this chapter. Apparently, needing to establish a new house, the need to harvest a field and cowardice were possible excuses. (See: [[rc://*/ta/man/translate/figs-explicit]])\n\r\n## Other possible translation difficulties in this chapter\n\n
-20:1	r5j1		rc://*/ta/man/translate/figs-explicit	וְֽ⁠רָאִ֜יתָ ס֤וּס וָ⁠רֶ֨כֶב֙	1	The implication is that an army with **horses and chariots** was a very strong army, so anyone who was fighting that army would be afraid. You could include this information if that would be helpful to your readers. Alternate translation: “and see a strong army with horses and chariots”\n
-=======
 20:intro	qq8m				0	# Deuteronomy 20 General Notes\n\n## Structure and Formatting\n\n### Outline\n- vv. 1-20: Instructions for going to war.\n\n## Religious and Cultural Concepts in This Chapter\n\n### Yahweh’s protection\nIsrael was not to worry about the power and strength of other nations. Instead, they were to trust in the power of Yahweh. He is the source of their military strength and protection. This is why a priest leads them into battle, rather than a military commander. (See: [[rc://*/tw/dict/bible/kt/trust]] and [[rc://*/tw/dict/bible/kt/priest]])\n\n### Holy war\n\nIsrael’s conquering of the Promised Land was unique in history. It was a type of holy war and had special rules. This war was really Yahweh’s punishment against the sin of the Canaanite people. If the people were not completely destroyed, they would cause Israel to sin. (See: [[rc://*/tw/dict/bible/kt/promisedland]] and [[rc://*/tw/dict/bible/kt/holy]] and [[rc://*/tw/dict/bible/kt/sin]])\n\n## Translation Issues in This Chapter\n\n### “What man is there”\nThis phrase is used several times to introduce a rhetorical question. The questions are intended to tell the readers that Yahweh only wants soldiers who are completely dedicated to fighting for him. (See: [[rc://*/ta/man/translate/figs-rquestion]])\n\n##### Excused from fighting\n\nIn ancient Israel, men were excused from fighting in battle for several different reasons. Some of these reasons are mentioned in this chapter. Apparently, needing to establish a new house, the need to harvest a field and cowardice were possible excuses. (See: [[rc://*/ta/man/translate/figs-explicit]])\n\n## Translation Issues in This Chapter
 20:1	r5j1		rc://*/ta/man/translate/figs-explicit	וְֽ⁠רָאִ֜יתָ ס֤וּס וָ⁠רֶ֨כֶב֙	1	The implication is that an army with **horses and chariots** was a very strong army, so anyone who was fighting that army would be afraid. You could include this information if that would be helpful to your readers. Alternate translation: “and see a strong army with horses and chariots”
->>>>>>> origin/master
 20:1	e1bw		rc://*/ta/man/translate/figs-metonymy	עַ֚ם	1	Here, **people** represents the army of that people. If it would be helpful in your language, you could use an equivalent expression from your language or state the meaning plainly. Alternate translation: “a people whose army is”
 20:1	raez		rc://*/ta/man/translate/writing-pronouns	מֵ⁠הֶ֑ם	1	The pronoun **them** refers to the army of the people group. If this is not clear for your readers, you could use the person's name here. Alternate translation: “of their army”
 20:1	ta4q		rc://*/ta/man/translate/figs-metaphor	הַ⁠מַּֽעַלְ⁠ךָ֖ מֵ⁠אֶ֥רֶץ מִצְרָֽיִם	1	Here Moses is speaking of Yahweh bringing the Israelites out of Egypt as if Yahweh were raising the people up. If it would be helpful in your language, you could state the meaning plainly. Alternate translation: “who brought you from the land of Egypt”