1 new commit pushed to

<https://github.com/osquery/osquery/tree/master|master>

by zwass

<https://github.com/osquery/osquery/commit/5c00d9f0a9e029a4544dafec628a16fe2d58e458|5c00d9f0>

- Fix merge conflict from #8738 and #8740 (#8774) osquery/osquery