Fixed minor bug in trace merging. hum hum.