Updated guard-trace merging