remove make_merge_conflict.py file
Partial python3 compatibility.