diff --git a/Fall2017/Fall2017info b/Fall2017/Fall2017info
index 923f915..c72ad12 100644
--- a/Fall2017/Fall2017info
+++ b/Fall2017/Fall2017info
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 Machine Learning Working Group Fall 2017
-=======
-chine Learning Working Group Fall 2017
->>>>>>> be43f7c9e9d51ef2be389593feef6874b136e59b
 
 This semester's topic is neural networks for image processing!