Merge trap into tracker-host