Improve test_merge_conflict via new prompt_yes_or_no
#147
+100
−21
test_merge_conflict via new prompt_yes_or_no
#147