resolve conflicts

charts/postgres-operator/crds/postgresqls.yaml

docs/administrator.md

docs/reference/cluster_manifest.md

e2e/tests/test_e2e.py

manifests/complete-postgres-manifest.yaml

manifests/postgresql.crd.yaml

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

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

pkg/cluster/k8sres.go

pkg/cluster/k8sres_test.go

pkg/cluster/pod.go

pkg/cluster/sync.go

pkg/cluster/sync_test.go

ui/operator_ui/main.py