040000 tree 45b6c29eb06fbcaa91320139683df1d3ba568820	conflict-rest-services
040000 tree cef852c6038288ff94c5d979ddc169d92b43eca9	conflict-rest-types
100644 blob d45bbb43363acdb18b93b3a13a340832832359cf	pom.xml