merged update && sync