- solve sync issue
 - resolved conflict