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