bug fix
handle conflict