fixed small merge conflict
fixed small merge conflict