Updated behavior when encountering merges-cf annotations

Instead of always calling (step* (ko phi k)), call step* with the appropriate argument: either (ko phi k) or the state returned after executing the mp-tail-trace