040000 tree b30b97515cb3e92e9b647113241ecf3526a09b66	conflict-rest-services
040000 tree 81c133cb3fcb1616a36ea52d495707c9506e5181	conflict-rest-types
100644 blob 84de4eff4850d8e8951cbe02e6f3873c7ef9db69	pom.xml