boat collision working in fishing phase
Merge branch 'boatCollisions'