chat merchant collision
Merge branch 'master' of https://github.com/bobpatate/GameJamH14