hammerhead: fix merge typo

Change-Id: Idcf926c73f137d1addf2be3980ebfb2d65764559