Update test.txt

Adding several lines in order to create a conflict in a future commit