Working again, code more organized in reconstructmergetool.py