Merge routine nearly done, learning a lot