040000 tree 1300992cfbc5782d9a69e37e83ba50e4ace43bbe	conflict-rest-services
040000 tree 3edface86ab03df4052b18e0d35bf9c431970599	conflict-rest-types
100644 blob 5809a4ea88576acf4a49b559b3439e1cb0fb52f8	pom.xml