bug fix
conflict fixed