'Joyous' end to bitter rift