fix value: null case
resolve merge