Now using relayer command so 5.5.4+ only. Partially implemented conflict resolution UI.