fix issue with merge handling null values