Update make_conflict.txt