Adds test2.txt
Modifies test1.txt
Relolves mergeconflict in test1.txt