Merge with tunneling software