diff --git a/pylot/core/active/fmtomoUtils.py b/pylot/core/active/fmtomoUtils.py
index ec9bcbb3..92ef7e5d 100644
--- a/pylot/core/active/fmtomoUtils.py
+++ b/pylot/core/active/fmtomoUtils.py
@@ -325,13 +325,9 @@ def vgrids2VTK(inputfile='vgrids.in', outputfile='vgrids.vtk', absOrRel='abs', i
 
     outfile.writelines('POINT_DATA %15d\n' % (nPoints))
     if absOrRel == 'abs':
-<<<<<<< HEAD
         outfile.writelines('SCALARS velocity float %d\n' %(1))
     if absOrRel == 'relDepth':
         outfile.writelines('SCALARS velocity2depthMean float %d\n' %(1))
-=======
-        outfile.writelines('SCALARS velocity float %d\n' % (1))
->>>>>>> 37f9292c39246b327d3630995ca2521725c6cdd7
     elif absOrRel == 'rel':
         outfile.writelines('SCALARS velChangePercent float %d\n' % (1))
     outfile.writelines('LOOKUP_TABLE default\n')
@@ -342,7 +338,6 @@ def vgrids2VTK(inputfile='vgrids.in', outputfile='vgrids.vtk', absOrRel='abs', i
     if absOrRel == 'abs':
         print("Writing velocity values to VTK file...")
         for velocity in vel:
-<<<<<<< HEAD
             outfile.writelines('%10f\n' %velocity)
     elif absOrRel == 'relDepth':
         print("Writing velocity values to VTK file relative to mean of each depth...")
@@ -357,9 +352,6 @@ def vgrids2VTK(inputfile='vgrids.in', outputfile='vgrids.vtk', absOrRel='abs', i
                 for vel in veldepth:
                     outfile.writelines('%10f\n' %(vel - velmean))
                 veldepth = []
-=======
-            outfile.writelines('%10f\n' % velocity)
->>>>>>> 37f9292c39246b327d3630995ca2521725c6cdd7
     elif absOrRel == 'rel':
         nref, dref, sref, velref = _readVgrid(inputfileref)
         nR_ref, nTheta_ref, nPhi_ref = nref