Fix ia64 mismerge

2 files changed