create branch collision-test-1
remove wrong NormalForce processing & fix bug of conservation of momentum