040000 tree d46c041c8038238412d3034762227058106285ce	conflict-rest-services
040000 tree d320846d0a5edf285074a103e3376923de2d349d	conflict-rest-types
100644 blob c96651ce2300545394149df062848627f2d6c7ae	pom.xml