Resolve conflicts in CHANGELOG.md

Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8551

CHANGELOG.md

@@ -4,31 +4,18 @@ entry.
 
 ## 11.5.0 (2018-11-22)
 
-<<<<<<< HEAD
-### Security (9 changes, 1 of them is from the community)
-
-- Escape entity title while autocomplete template rendering to prevent XSS. !2556
-- Update moment to 2.22.2. !22648 (Takuya Noguchi)
-- Fix XSS in merge request source branch name.
-=======
 ### Security (10 changes, 1 of them is from the community)
 
 - Escape entity title while autocomplete template rendering to prevent XSS. !2556
 - Update moment to 2.22.2. !22648 (Takuya Noguchi)
 - Redact personal tokens in unsubscribe links.
->>>>>>> upstream/master
 - Escape user fullname while rendering autocomplete template to prevent XSS.
 - Persist only SHA digest of PersonalAccessToken#token.
 - Monkey kubeclient to not follow any redirects.
 - Prevent SSRF attacks in HipChat integration.
-<<<<<<< HEAD
-- Validate Wiki attachments are valid temporary files.
-- Redact personal tokens in unsubscribe links.
-=======
 - Prevent templated services from being imported.
 - Validate Wiki attachments are valid temporary files.
 - Fix XSS in merge request source branch name.
->>>>>>> upstream/master
 
 ### Removed (2 changes)