Merge new software for new hardware