Nakamura buries hatchet with Nichia Corp.