more merge madness