fix conflicts

charts/postgres-operator/crds/operatorconfigurations.yaml

charts/postgres-operator/crds/postgresqls.yaml

charts/postgres-operator/values.yaml

docs/reference/cluster_manifest.md

docs/reference/operator_parameters.md

manifests/configmap.yaml

manifests/operatorconfiguration.crd.yaml

manifests/postgresql-operator-default-configuration.yaml

manifests/postgresql.crd.yaml

pkg/apis/acid.zalan.do/v1/crds.go

pkg/apis/acid.zalan.do/v1/operator_configuration_type.go

pkg/apis/acid.zalan.do/v1/postgresql_type.go

pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go

pkg/cluster/cluster.go

pkg/cluster/k8sres.go

pkg/controller/operator_config.go

pkg/util/config/config.go