Fixed merge conflicts

sample/sampleNovel/data_6/36b6aa9b697b_main.nwd

@@ -12,6 +12,8 @@ In addition, the editor supports automatic formatting of “quotes”, both doub
 
 If you have the need for it, you can also add text that can be automatically replaced by other text when you generate a preview or export the project. Now, let’s auto-replace this A with <A>, and this C with <C>.  While <E> is just <E>. Press Ctrl+R to see what this looks like in the view pane.
 
+The editor also supports non breaking spaces, and the spell checker accepts long dashes—like this—as valid word separators.
+
 #### Some Section Here
 
 If you need to split a scene file up into further pieces, you can do so with the level four heading, like above. This is referred to as a section.

sample/sampleNovel/nwProject.nwx

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="0.4.1" fileVersion="1.0" timeStamp="2019-11-10 17:08:04">
+<novelWriterXML appVersion="0.4.1" fileVersion="1.0" timeStamp="2019-11-16 12:31:19">
   <project>
     <name>Sample Project</name>
     <title>Sample Project</title>
@@ -9,9 +9,9 @@
   </project>
   <settings>
     <spellCheck>True</spellCheck>
-    <lastEdited>6a2d6d5f4f401</lastEdited>
+    <lastEdited>636b6aa9b697b</lastEdited>
     <lastViewed>b3e74dbc1f584</lastViewed>
-    <lastWordCount>849</lastWordCount>
+    <lastWordCount>875</lastWordCount>
     <autoReplace>
       <A>B</A>
       <B>E</B>
@@ -79,10 +79,10 @@
       <status>1st Draft</status>
       <expanded>False</expanded>
       <layout>SCENE</layout>
-      <charCount>1076</charCount>
-      <wordCount>196</wordCount>
-      <paraCount>6</paraCount>
-      <cursorPos>59</cursorPos>
+      <charCount>1199</charCount>
+      <wordCount>216</wordCount>
+      <paraCount>7</paraCount>
+      <cursorPos>949</cursorPos>
     </item>
     <item handle="bc0cbd2a407f3" order="2" parent="e7ded148d6e4a">
       <name>Another Scene</name>
@@ -118,7 +118,11 @@
       <charCount>1692</charCount>
       <wordCount>313</wordCount>
       <paraCount>6</paraCount>
+<<<<<<< HEAD
       <cursorPos>144</cursorPos>
+=======
+      <cursorPos>530</cursorPos>
+>>>>>>> master
     </item>
     <item handle="88706ddc78b1b" order="5" parent="e7ded148d6e4a">
       <name>Chapter Two</name>