Fixed policyblock to handle merging