recreate transitive signal merge error in unit test and fix merge to work around this