Fix merge mistake

Author: bbiggerr

src/content/changelog/4-81-0-2020-12-02.md

@@ -15,9 +15,6 @@ changelog:
 
 - [OAuth Reference](/docs/api/#oauth-reference) has been updated to include Firewall, Maintenance, and Object Storage security scopes.
 
-<<<<<<< HEAD
 - The `x-linode-grant` for the [Event Mark as Seen](/docs/api/account/#event-mark-as-seen) (POST /account/events/{eventId}/seen) endpoint has been corrected to `read_only`. Previously, it was stated as `read_write`.
 
-=======
->>>>>>> 04b99b2a06162acf4767b03827fdb3c016b3db98
 - The OAuth scope for the [Firewalls List](/docs/api/networking/#firewalls-list) (GET /networking/firewalls) endpoint has been correct to `firewall:read_only`. Previously, it was stated as `firewalls:read_only`.