Create new_conflict.txt