Fix twoway_merge that passed d/f conflict marker to merged_entry().