added diff-match-patch to demoproject requirements
new "callback" conflict management policy