conflict is yokunai
conflict zero
conflict satori
Merge pull request #9 from 3phomosex/oreo/conflict

Oreo/conflict