changing a.txt
merged conflict