Fix conflicts garbage