local conflict bug fix