diff --git a/user/chenyk/SConstruct b/user/chenyk/SConstruct
index cca74d96c..212bda3ba 100644
--- a/user/chenyk/SConstruct
+++ b/user/chenyk/SConstruct
@@ -10,22 +10,14 @@ zerotrace hilbert cdivdir cabs cemd1 cemd2 snr2 snr3 snrcyk preerror
 threshold1 tsmf fxdecon simidenoise bin2rsf rsf2bin halfthr hradon
 suplane simidenoise1 rmtrace prekirch psmig pocssemb afd2d
 prekirchsr simpostkirch presr nlm1 nlm2 dblendseis svmf genshotscyk dip_fb dipn_fb dipl dipln selfblend ycvelxf ycvelinvww afd2domp low addtrace matlr pnmomf expd ltfts ltftn fxynpre fxynpre2
-<<<<<<< HEAD
 orthol orthon orthonc orthoa smoothn warpscann dipn efd3dmt aps3d sint2 sint3 eikonal_rtp eikonal_surf eikonal_surf_dv1d txt2rsf rsf2txt npef5_recon
 '''
 ccprogs = 'diffcxx'
 
 # broken: Mnpef5
 
-# mutter3
-=======
-orthol orthon orthonc orthoa smoothn warpscann dipn efd3dmt sint2 sint3 eikonal_rtp eikonal_surf eikonal_surf_dv1d txt2rsf rsf2txt npef5_recon
-'''
-ccprogs = 'diffcxx'
-
 # mutter3 aps3d npef5
 
->>>>>>> 453d39391 (	modified:   user/chenyk/SConstruct)
 mpiprogs='''
 mpiafdfwi2d 
 '''#mpiafdfwi3d (not finished yet)