Added text to make a conflict
Fixed conflict in test.txt