Fix conflicts output