Repair LHA layout after merge