add HCAL+run with PU
resolve conflicts
delete