updated setup.py to version==1.0.0, finished debugging mergeTool.py, ready for deploy