A distributed wiki editor that supports good automatic merge resolution. Undergoing testing; needs a better UI.