Fix merge conflict

1 job for issue-instructions in 51 seconds (queued for 2 seconds)