diff --git a/inputs/autoPyLoT_local.in b/inputs/autoPyLoT_local.in
index 329a0fe2..725a9dec 100644
--- a/inputs/autoPyLoT_local.in
+++ b/inputs/autoPyLoT_local.in
@@ -11,6 +11,7 @@ EVENT_DATA/LOCAL		    #datapath#     %data path
 /DATA/Insheim/STAT_INFO             #invdir#       %full path to inventory or dataless-seed file
 PILOT				    #datastructure#%choose data structure
 0                                   #iplot#        %flag for plotting: 0 none, 1 partly, >1 everything
+True                                #apverbose#    %choose 'True' or 'False' for terminal output
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 #NLLoc settings#
 /home/ludger/NLLOC                  #nllocbin#     %path to NLLoc executable
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
diff --git a/pylot/core/pick/autopick.py b/pylot/core/pick/autopick.py
index 9879feb7..efbceff8 100755
--- a/pylot/core/pick/autopick.py
+++ b/pylot/core/pick/autopick.py
@@ -31,6 +31,7 @@ def autopickevent(data, param):
     wdttolerance = param.get('wdttolerance')
     mdttolerance = param.get('mdttolerance')
     iplot = param.get('iplot')
+    apverbose = param.get('apverbose')
     for n in range(len(data)):
         station = data[n].stats.station
         if station not in stations:
@@ -40,7 +41,7 @@ def autopickevent(data, param):
 
     for station in stations:
         topick = data.select(station=station)
-        all_onsets[station] = autopickstation(topick, param)
+        all_onsets[station] = autopickstation(topick, param, verbose=apverbose)
 
     # quality control
     # median check and jackknife on P-onset times
@@ -366,7 +367,6 @@ def autopickstation(wfstream, pickparam, verbose=False):
                      round(min([mpickP + sstop, Lwf]))]
 
         if algoS == 'ARH':
-            if verbose: print(edat, ndat)
             # re-create stream object including both horizontal components
             hdat = edat.copy()
             hdat += ndat
@@ -383,7 +383,6 @@ def autopickstation(wfstream, pickparam, verbose=False):
             h_copy[0].data = trH1_filt.data
             h_copy[1].data = trH2_filt.data
         elif algoS == 'AR3':
-            if verbose: print(zdat, edat, ndat)
             # re-create stream object including all components
             hdat = zdat.copy()
             hdat += edat