[TASK] Clearly arrange conflicts and dependencies

Change-Id: Iffbbae79b8d6266b1eb05e63e0af393e49408a5c
Resolves: #57648
Reviewed-on: https://review.typo3.org/29161
Reviewed-by: Philipp Gampe
Reviewed-by: Thomas Loeffler
Tested-by: Thomas Loeffler