JAL-3377 fix up failed merge