fix(ras-acc): cleanup merge conflict markup

[chickenn00dle]

All Submissions:

• [ ] Have you followed the Newspack Contributing guideline?
• [ ] Does your code follow the WordPress' coding standards and VIP Go coding standards?
• [ ] Have you checked to ensure there aren't other open Pull Requests for the same update/change?

Changes proposed in this Pull Request:

Left some merge conflict markup while merging trunk 🙇

This PR cleans it up!

How to test the changes in this Pull Request:

1. Code review should be enough

Other information:

• [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
• [ ] Have you written new tests for your changes, as applicable?
• [ ] Have you successfully ran tests with your changes locally?

[matticbot]

:tada: This PR is included in version 1.91.0-epic-ras-acc.2 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

[matticbot]

:tada: This PR is included in version 1.92.0-epic-ras-acc.1 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

[matticbot]

:tada: This PR is included in version 1.93.0-epic-ras-acc.1 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

[matticbot]

:tada: This PR is included in version 2.1.0-epic-ras-acc.1 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket: