New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/38942#issuecomment-1328997535

Comment:
> should i resolve this conflict too?

Rebase your branch with recent changes from master.

```
git checkout master
git pull --rebase upstream master
git rebase master nm-openvpn
```

Push again after that.