bug fix
resolve merge conflict