0008: edit file 2 to create a confict
Revert "0008: edit file 2 to create a confict"

This reverts commit 53f17c12adc26788a81b369ddd8eb4cba0a8c4dc.