[IA64] Manual merge fix for 3 files