Collisions between hero and bad guys detected.
Merge remote-tracking branch 'origin/master'