last changes param
merge fix