made corrections to 2pumptest.py
conflict resolved