replaced i386 with uname -i
resolved merge conflict