delete age on package.json
add empty test.txt file
add content to test.txt
add content to test.txt
conflict fixed test.txt