fixed bouncing on falling blocks
merge conflict