Adding a conflict to skamilwa file
merging files