Conflict Test

conflicTest.txt - change the words