shall show merging conflicts