that oxford comma

andypiper · Dec 7, 2017 · 1858009 · 1858009
1 parent eaeb908
commit 1858009
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/paths/merge-conflict/02-setup-repository.md b/paths/merge-conflict/02-setup-repository.md
@@ -9,7 +9,7 @@ next-page: /merge-conflicts/normal-merge/
 sidebar:
   nav: "merge-conflicts"
 main-content: |
-  To participate in this course, you're going to need to **import** a project from the [GitHub Training organization](https://github.com/githubtraining). Importing a project will essentially copy the repository -- including all of the files, branches and history to your account.
+  To participate in this course, you're going to need to **import** a project from the [GitHub Training organization](https://github.com/githubtraining). Importing a project will essentially copy the repository -- including all of the files, branches, and history to your account.
 
   [![instructions for using the repository import tool](../../images/gifs/merge-conflict/mc-import.gif)](../../images/gifs/merge-conflict/mc-import.gif)