Added three.txt
Resolved merge conflict