Handled a merged conflict