implemented diff3 functionality #235

Job	Run time
plan	27s
build-global-artifacts	-1s
build-local-artifacts (${{ join(matrix.targets, ', ') }})	-1s
host	0s
announce	0s
	25s

Provide feedback