# Conflicts: # src/policy/src/main/java/org/etsi/tfs/policy/policy/PolicyServiceImpl.java # src/policy/target/kubernetes/kubernetes.yml