merge x86 here