add test_conflict.txt