last fix to param
resolved conflict