added section on diff to xep0050, asynchronous server updates how to merge fields during asynchronous updates