Fix conflict in readme
Merge branch 'master' of github.com:pingpong-labs/modules into develop
Fix indent & conflict