some conflicts for fun
Merge pull request #4 from thomasmalbaux/resolve-conflict-learning

some conflicts for fun
more desc