Put collision-handling code in a method
Merge remote-tracking branch 'origin/master'