diff --git a/02-EXO/36.usfm b/02-EXO/36.usfm
index d9410796..9dcf2df1 100644
--- a/02-EXO/36.usfm
+++ b/02-EXO/36.usfm
@@ -3,11 +3,7 @@
 \s5
 \c 36
 \p
-<<<<<<< HEAD
-\v 1 So Bezalel and Oholiab will work, as well as every who is wise in heart in whom Yahweh has put skill and understanding to know how to build the holy place, following the instructions that he has given you to do."
-=======
 \v 1 So Bezalel and Oholiab will work, as well as every who was wise of heart, in whom Yahweh has put skill and understanding to know how to build the holy place, following the instructions that he has given you to do."
->>>>>>> origin/master
 
 \s5
 \p