fixing bug
merge version