Fix merge conflict (#5371)

Co-authored-by: Joey Orlando <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: Joey Orlando <[email protected]>
Co-authored-by: Vadim Stepanov <[email protected]>
Co-authored-by: Dominik Broj <[email protected]>
Co-authored-by: Michael Derynck <[email protected]>
Co-authored-by: Yulya Artyukhina <[email protected]>
Co-authored-by: Innokentii Konstantinov <[email protected]>
Co-authored-by: Ildar Iskhakov <[email protected]>
Co-authored-by: grafana-irm-app[bot] <165293418+grafana-irm-app[bot]@users.noreply.github.com>
Co-authored-by: youve <[email protected]>