Bridge conflict bug fix