modifying 3.txt
merge conflict