bug fix

fix the bug cause by the conflict