fix conflict #13256

Job	Run time
Core Basic (18.x)	6m 28s
Core Basic - Plone 5 (18.x)	7m 27s
Core Blocks (18.x)	7m 36s
Core Basic (20.x)	7m 55s
Core Blocks (20.x)	7m 38s
Core Blocks - Listing (18.x)	5m 22s
Core Content (18.x)	4m 5s
Core Blocks - Listing (20.x)	5m 32s
Core Control Panels (18.x)	4m 35s
Core Content (20.x)	3m 59s
Core Volto Slate (18.x)	7m 37s
Core Control Panels (20.x)	5m 6s
Core Volto Slate (20.x)	7m 16s
Coresandbox (18.x)	4m 38s
Guillotina (18.x)	4m 50s
Project Generator (18.x)	6m 39s
Multilingual (18.x)	4m 7s
Project Generator (20.x)	4m 59s
Multilingual in Seamless Mode (18.x)	4m 55s
Seamless Mode (18.x)	6m 50s
Working Copy (18.x)	4m 13s
	2h 1m 47s

Provide feedback