Fixed broken merge in qtcmerge.py