sign fix - conditional type join
merge