diff --git a/moose-core/VERSION b/moose-core/VERSION
index a0c5fa178b1caf69176de685b41d4d020e1a908b..b9404dbf8a99759e44649078d381921fd572ddab 100644
--- a/moose-core/VERSION
+++ b/moose-core/VERSION
@@ -1 +1 @@
-3.1.1-160-g4b57369
\ No newline at end of file
+3.1.1-163-g681473b
\ No newline at end of file
diff --git a/moose-examples/snippets/analogStimTable.py b/moose-examples/snippets/analogStimTable.py
index 9b29b6f77ee92b59e66a1fabe9400c2c101d0a94..6d2b413c67a67efc54187db961a9ec2c39c646a8 100644
--- a/moose-examples/snippets/analogStimTable.py
+++ b/moose-examples/snippets/analogStimTable.py
@@ -72,29 +72,24 @@ def analogStimTable():
 
 def main():
     """
-Example of using a StimulusTable as an analog signal source in
-a reaction system. It could be used similarly to give other
-analog inputs to a model, such as a current or voltage clamp signal.
+    Example of using a StimulusTable as an analog signal source in
+    a reaction system. It could be used similarly to give other
+    analog inputs to a model, such as a current or voltage clamp signal.
 
-This demo creates a StimulusTable and assigns it half a sine wave.
-Then we assign the start time and period over which to emit the wave.
-The output of the StimTable is sent to a pool **a**, which participates
-in a trivial reaction::
+    This demo creates a StimulusTable and assigns it half a sine wave.
+    Then we assign the start time and period over which to emit the wave.
+    The output of the StimTable is sent to a pool **a**, which participates
+    in a trivial reaction::
 
-    table ----> a <===> b
+        table ----> a <===> b
 
-The output of **a** and **b** are recorded in a regular table
-for plotting.
+    The output of **a** and **b** are recorded in a regular table
+    for plotting.
     """
     analogStimTable()
 
 if __name__ == '__main__':
-<<<<<<< HEAD
-    main
-=======
     main()
->>>>>>> 0e491aa41584cf7a66c0e242374d8ee61660eb7b
-
 
 
 #