sync update data object
resolve conflicts