remove conflict, playground-309
Merge pull request #23 from thomaroger/troger-fix-conflict-309

[RFR] remove conflict, playground-309