040000 tree 83e5f2122315372b980ab8f5adf57fe2a07ded8a	conflict-rest-services
040000 tree 5c7eabd4c99ce27295e3ff2056a9656a16fe2d00	conflict-rest-types
100644 blob df5e003b0a4a266f3b7a1dd8178baf8396ce4e7a	pom.xml