Adding conflict lines
Add two data files for exercise