diff --git a/xnba/xnba-undi.spec b/xnba/xnba-undi.spec
index 2a93a9e..afde87c 100644
--- a/xnba/xnba-undi.spec
+++ b/xnba/xnba-undi.spec
@@ -15,12 +15,7 @@ BuildArch:	noarch
 %define os_release %(rpm -q --qf '%%{release}' %{Distribution}-release | cut -d"." -f 1)
 
 
-<<<<<<< HEAD
-#git from 2011/12/15
-Source0: xnba-%{version}-111215.tar.bz2 
-=======
 Source0: xnba-%{version}-111103.tar.bz2
->>>>>>> Update spec file
 
 %description
 The xCAT Network Boot Agent is a slightly modified version of gPXE.  It provides enhanced boot features for any UNDI compliant x86 host.  This includes iSCSI, http/ftp downloads, and gPXE script based booting.