Added line 7 to test.txt
Resolved conflicts in test.txt