bug fixed
merge solved