[TASK] Remove conflict code

Remove conflict code which was luckily inside doc-comments.

Resolves: #51745
Releases: 6.1, 6.0
Change-Id: I2a175000028fb12a7a1558494e70b9183dd61786
Reviewed-on: https://review.typo3.org/23622
Reviewed-by: Sascha Egerer
Tested-by: Sascha Egerer
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel