Split the merge conflict check output onto two lines.