Edited file1.txt
Fixed Conflicts