remove BB ref

csetarun · Dec 5, 2017 · d14323e · d14323e
1 parent 3044332
commit d14323e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/paths/merge-conflict/06-ex-03.md b/paths/merge-conflict/06-ex-03.md
@@ -29,7 +29,7 @@ main-content: |
   1. Create a new pull request. Use the **base:** of `master` and the **compare:** of `username-education`.
   1. Click **Create pull request**.
   1. In the **This branch has conflicts that must be resolved** section of the pull request, you can click the **Resolve conflicts** button to resolve the merge conflict.
-  1. It would appear that Momtocat and Poptocat recently made changes to the `master` branch and modified the same files you did, this is what is causing the merge conflicts. Similar to when we had to resolve a merge conflict with Bob's changes, remove Momtocat's contributions from the `education.yml` and Poptocat's contributions from the `interests.yml` files.
+  1. It would appear that Momtocat and Poptocat recently made changes to the `master` branch and modified the same files you did, this is what is causing the merge conflicts. Similar to when we had to resolve a merge conflict with Skatetocat's changes, remove Momtocat's contributions from the `education.yml` and Poptocat's contributions from the `interests.yml` files.
 
         ![momtocat](https://octodex.github.com/images/momtocat.png)