edited a3.txt -b
merged conflicting a3.txt