Resolve changelog conflict from CE backport

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16506
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4112

changelogs/unreleased-ee/4378-fix-cluster-js-not-running-on-update-page.yml

 ---
 title: Fix JavaScript bundle running on Cluster update/destroy pages
-<<<<<<< HEAD
 merge_request: 4112
-=======
-merge_request:
->>>>>>> upstream/master
 author:
 type: fixed