Remove git conflict-marked areas

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | 
| License       | MIT
| Doc PR        | 

This simply removes the merge conflict-marked areas and sets the code to use the 2.3 branches merged changes.