fix panic when tangle.Fork() is called

dapps/valuetransfers/packages/tangle/tangle.go

@@ -234,7 +234,7 @@ func (tangle *Tangle) Fork(transactionID transaction.ID, conflictingInputs []tra
 	}
 
 	// trigger events + set result
-	tangle.Events.Fork.Trigger(cachedTransaction, cachedTransactionMetadata)
+	tangle.Events.Fork.Trigger(cachedTransaction, cachedTransactionMetadata, cachedTargetBranch, conflictingInputs)
 	forked = true
 
 	return

tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go

@@ -164,7 +164,7 @@ func TestConsensusFiftyFiftyOpinionSplit(t *testing.T) {
 			Finalized: tests.True(),
 		}
 	}
-	err = tests.AwaitTransactionInclusionState(n.Peers(), awaitFinalization, 4*time.Minute)
+	err = tests.AwaitTransactionInclusionState(n.Peers(), awaitFinalization, 2*time.Minute)
 	assert.NoError(t, err)
 
 	// now all transactions must be finalized and at most one must be confirmed