diff --git a/ChangeHistory.md b/ChangeHistory.md
index 9ca18385..a0057a3e 100755
--- a/ChangeHistory.md
+++ b/ChangeHistory.md
@@ -13,6 +13,7 @@ Here is a link to the [Git diffs](https://github.com/krlawrence/graph/compare/v2
 - Began adding coverage of TinkerPop 3.4 features. Issue #115 and #108
   - Added a mention of TinkerPop 3.4 in the Introduction.
   - Added a section describing the new `index` step.
+  - Added coverage of nested and named `repeat` steps.
   - Added `nested-repeat.groovy` to the `sample-code` folder.
   - Added coverage of the new features for `min` and `max` steps.
   - Expanded existing `valueMap` coverage and added new sections covering the new `unfold`-`by`,`with` and `WithOptions` features.
diff --git a/book/Gremlin-Graph-Guide.adoc b/book/Gremlin-Graph-Guide.adoc
index f9917f4a..a5eb72d8 100644
--- a/book/Gremlin-Graph-Guide.adoc
+++ b/book/Gremlin-Graph-Guide.adoc
@@ -2,9 +2,15 @@ PRACTICAL GREMLIN: An Apache TinkerPop Tutorial
 ===============================================
 Kelvin R. Lawrence <gfxman@yahoo.com>
 //v281 (TP 3.3.5), January 28th 2019
+<<<<<<< HEAD
 v282-preview, July 12th 2019
 // vim: set tw=85 cc=+1 wrap spell redrawtime=20000:
 // Sun Jul 14, 2019 10:48:58 CDT
+=======
+v282-preview, July 9th 2019
+// vim: set tw=85 cc=+1 wrap spell redrawtime=20000:
+// Tue Jul 09, 2019 13:58:11 CDT
+>>>>>>> e5447a21284709eba91d6d0b177de412a2b47c2d
 //:Author:    Kelvin R. Lawrence
 //:Email:     gfxman@yahoo.com
 :Numbered: