bug fix
fixed merge conflicts