A commit
 A commit
Das z
Solved conflict in a.txt