040000 tree d825544b21accc2daa6d413775d763c2ea2d3e64	conflict-rest-services
040000 tree eb0fec033a62ceb44c8e6c2612b471f6168d4496	conflict-rest-types
100644 blob 56b35f8863553ddd15004baef57a9a2101d41fda	pom.xml