diff --git a/lab2CA.xpr b/lab2CA.xpr
index 67fff0d..d15e3f5 100644
--- a/lab2CA.xpr
+++ b/lab2CA.xpr
@@ -3,11 +3,7 @@
 <!--                                                         -->
 <!-- Copyright 1986-2018 Xilinx, Inc. All Rights Reserved.   -->
 
-<<<<<<< HEAD
 <Project Version="7" Minor="39" Path="C:/Users/ecelab/ECE3570-Lab/lab2CA.xpr">
-=======
-<Project Version="7" Minor="39" Path="C:/REPOSITORIES/Educational/Western Michigan University/ECE3570-Lab/lab2CA.xpr">
->>>>>>> eac5d71dd65c2eb38e5151a1cdc30860d1430018
   <DefaultLaunch Dir="$PRUNDIR"/>
   <Configuration>
     <Option Name="Id" Val="0a5803efda44405bb28bbf43ba22e808"/>