2 files committed
change done by p2
change by p1
change after merge conflict
after secind conflict