test pullrequest+conflict on A.txt