Conflict resolving by merging fields on the server

Thanks Jens for the answer.