(refs #73)Add Wiki conflict detection and some fix.