fix merge conflicts : Makefile X86