maybe fixed the collision problem
fixed merge conflict