Update new_conflict.txt