fix on bugs
merge