Updated make-merges-cf-after-guard-function

If, when tracing a guard, a merges-cf annotation is encountered, tracing should continue with a different trace key, namely (trace-key label '()), since you're no longer tracing a guard but a merge-point-tail.