added conano merging stub to merging.py