added conflict fixtures
initial commit
...