update links so continue button order matches nav

paths/merge-conflict/01-normal-merge.md

@@ -5,7 +5,7 @@ header:
   overlay_filter: rgba(46, 129, 200, 0.6)
 title: A Normal Merge
 permalink: /merge-conflicts/normal-merge/
-next-page: /merge-conflicts/first-conflict/
+next-page: /merge-conflicts/mc-description/
 sidebar:
   nav: "merge-conflicts"
 main-content: |

paths/merge-conflict/02-mc-desc.md

@@ -5,7 +5,7 @@ header:
   overlay_filter: rgba(46, 129, 200, 0.6)
 title: Merge Conflict Description
 permalink: /merge-conflicts/mc-description/
-next-page: /merge-conflicts/example-01/
+next-page: /merge-conflicts/first-conflict/
 sidebar:
   nav: "merge-conflicts"
 main-content: |

paths/merge-conflict/02-your-first-conflict.md

@@ -5,7 +5,7 @@ header:
   overlay_filter: rgba(46, 129, 200, 0.6)
 title: Your First Conflict
 permalink: /merge-conflicts/first-conflict/
-next-page: /merge-conflicts/mc-description/
+next-page: /merge-conflicts/example-01/
 sidebar:
   nav: "merge-conflicts"
 main-content: |

paths/merge-conflict/06-ex-03.md

@@ -5,7 +5,7 @@ header:
   overlay_filter: rgba(46, 129, 200, 0.6)
 title: Momtocat and Poptocat Lend a Hand
 permalink: /merge-conflicts/example-03/
-next-page: /merge-conflicts/ide-intro/
+next-page: /merge-conflicts/what-next/
 sidebar:
   nav: "merge-conflicts"
 main-content: |
@@ -33,9 +33,9 @@ main-content: |
 
         ![momtocat](https://octodex.github.com/images/momtocat.png)
 
-  1. With the merge conflict markers removed, click **Mark as resolved** 
+  1. With the merge conflict markers removed, click **Mark as resolved**
   1. Click **Commit merge**.
-  1. With the merge conflicts resolved, click **Merge pull request**. 
+  1. With the merge conflicts resolved, click **Merge pull request**.
 
         ![poptocat](https://octodex.github.com/images/poptocat.png)