coding bugfix, default params
merge