ex-96/108 (jebene): fixed merge.py tmp dir issues and consensus.py tag
naming issue