OTS - Revision 7089: /trunk/ots-demo/src/main/resources/conflict