diff --git a/README.md b/README.md
index 2e7cbfc..98df300 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
 ## git-tutorial
 
+<<<<<<< HEAD
+Contributors: Sidney Kochman, Grace Roller, John Thiel
+=======
 Contributors: Sidney Kochman, Hannah Lim, Andrew Qu, Grace Roller
+>>>>>>> upstream/master
 
 Thank you to [Daniele Procida](https://dont-be-afraid-to-commit.readthedocs.io/en/latest/git/commandlinegit.html) and [Nicola Paolucci](https://www.atlassian.com/git/articles/git-forks-and-upstreams) for their amazing Git resources!