Merge conflicts

Author: spacesailor24

scripts/e2e.geth.automine.sh

@@ -24,7 +24,7 @@ echo " "
 # Launch client w/ two unlocked accounts.
 # + accounts[0] default geth unlocked bal = ~infinity
 # + accounts[1] unlocked, signing password = 'left-hand-of-darkness'
-geth-dev-assistant --period 2 --accounts 1 --tag 'v1.10.3'
+geth-dev-assistant --period 2 --accounts 1 --tag 'stable'
 
 # Test
 GETH_AUTOMINE=true nyc --no-clean --silent _mocha -- \

scripts/e2e.geth.instamine.sh

@@ -24,7 +24,7 @@ echo " "
 # Launch client w/ two unlocked accounts.
 # + accounts[0] default geth unlocked bal = ~infinity
 # + accounts[1] unlocked, bal=50 eth, signing password = 'left-hand-of-darkness'
-geth-dev-assistant --accounts 1 --tag 'v1.10.3'
+geth-dev-assistant --accounts 1 --tag 'stable'
 
 # Test
 GETH_INSTAMINE=true nyc --no-clean --silent _mocha -- \