More collision.
Merge branch 'master' of https://github.com/Others/CodeDayPlatform.git