added collision damage
merge conflicts