merge in the trace gem