Merging seems fine now. The big point of failure right now: AFM rule 3 – it's just WRONG and I don't know how to make it right.