Remove merge transition code

[nflaig]

we should just remove the merge transition code, it's probably simpler than making it somehow work with gloas

Originally posted by @nflaig in #8660 (comment)

[nflaig]

#8318 we are already not executing these tests