arbeit an der kollisions methode
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'