fix little bug
resolve merge issue