fix sync bug
merge