merge i686 and x86_64