got stampede2 in place
add stampede2 and clean up merge