add test_conflict.txt and fix
merge