update sync
fixed merge error