Fix merge conflicts

Author: knewbury01

actions/ql/src/Security/CWE-829/UntrustedCheckoutCritical.ql

@@ -51,6 +51,6 @@ where
   event.getName() = checkoutTriggers() and
   not exists(ControlCheck check | check.protects(checkout, event, "untrusted-checkout")) and
   not exists(ControlCheck check | check.protects(poisonable, event, "untrusted-checkout"))
-select poisonable, checkout, poisonable,
+select checkout, checkout, poisonable,
   "Checkout of untrusted code in a privileged workflow with later potential execution (event trigger: $@).",
   event, event.getName()