Updated guard trace merging