These conflicts will be resolved in the following commits. We do it this way so that PR review is possible.
Electron doesn't support FreeBSD.