conficting change to a.txt
Conflicting commit
merged changes