restore merge operation in test #376

Job	Run time
Drop and Re-Seed Local Repository	48s
Deplete feature branch caches	0s
	48s

Provide feedback