Fix conflict oversight (#610) #205

Job	Run time
integration-tests	1h 3m 47s
apply-calico-rules	11s
process-upload-report	13s
add-fw-to-remaining-instances	18s
notify-slack	4s
	1h 4m 33s

Provide feedback