Fix merge problem and serialization to service.