put back old tar.gz and removed conflicts flag