better physics
fixed merge