Updated behavior when a merges-cf annotation is encountered

A 'pop-trace-frame' instruction is added to the trace, and if a guard is being trace, an additional 'pop-trace-frame' instruction is inserted