conflict bug fix