Fixed the bug in self-collision
merge