merging spi fix