wip: a third
Merge pull request #4 from thefury/conflict-test

Yeay - lets try