test pullrequest+conflict on A.txt
merge + conflict resolution