Conflict Test

Test for confilct in A.txt