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