diff --git a/src/training/tesstrain.sh b/src/training/tesstrain.sh
index 54d52a5188..714376b400 100755
--- a/src/training/tesstrain.sh
+++ b/src/training/tesstrain.sh
@@ -28,15 +28,11 @@ echo -e "USAGE: tesstrain.sh
      --run_shape_clustering     # Run shape clustering (use for Indic langs).
      --maxpages                 # Specify maximum pages to output (default:0=all)
      --save_box_tiff            # Save box/tiff pairs along with lstmf files.
-<<<<<<< HEAD
-     --x_size                   # Specify width of output image (default:3600)
-=======
      --xsize                    # Specify width of output image (default:3600)
     
   OPTIONAL flag for specifying directory with user specified box/tiff pairs.
   Files should be named similar to ${LANG_CODE}.${fontname}.exp${EXPOSURE}.box/tif
      --my_boxtiff_dir MY_BOXTIFF_DIR # Location of user specified box/tiff files.
->>>>>>> c7cd112... allow box/tiff pairs for LSTM training
      
   OPTIONAL flags for input data. If unspecified we will look for them in
   the langdata_dir directory.
@@ -89,7 +85,7 @@ if ((LINEDATA)); then
   phase_E_extract_features " --psm 6  lstm.train " 8 "lstmf"
   make__lstmdata
   tlog "\nCreated starter traineddata for LSTM training of language '${LANG_CODE}'\n"
-  tlog "\nRun 'lstmtraining' comman next to continue LSTM training for language '${LANG_CODE}'\n"
+  tlog "\nRun 'lstmtraining' command to continue LSTM training for language '${LANG_CODE}'\n"
 else
   phase_D_generate_dawg
   phase_E_extract_features "box.train" 8 "tr"