Feature x
Fixed y
Das z
Solved conflict in a.txt