policy merge fix