merging conflicts sorted