stein update
merge fix