Fixed conflict junk added to file by accident