Better fixture file structure
Merge conflict test