upcoming merge deprecations

noticed these in the test logs on canary:

```
DEPRECATION: Use of `merge` has been deprecated. Please use `assign` instead
```

This should be a pretty straightforward change, would love if anybody wants to help with it.