bug fix 11-25
solve the merge conflict