[BUGFIX] Remove leftovers from merge conflicts.

The most recent merge introduced some syntax errors because of some
remaining merge conflict markers.

Change-Id: Iaae3f454ed77818ad763ef4260bd7b0ed94c16f0
Relates: #58229
Releases: 6.2
Reviewed-on: https://review.typo3.org/29677
Reviewed-by: Nico de Haen
Tested-by: Nico de Haen