Added qstar-merge.py