040000 tree dabcb5c536e0411d53b4f7db356c43f9c10f36da	conflict-rest-services
040000 tree bc098bfcf77a8e8e0f508860ea93b4877edc01a5	conflict-rest-types
100644 blob 5c0dd367d217dafdc2cda5369fad9102d0a6c853	pom.xml