# Conflicts:
#	core/cva6.sv
#	core/ex_stage.sv
#	core/include/build_config_pkg.sv
#	core/issue_read_operands.sv
#	core/issue_stage.sv
#	verif/regress/smoke-tests.sh
#	verif/tests/testlist_cvxif.yaml

# Conflicts:
#	core/cva6.sv

# Conflicts:
#	verif/core-v-verif

# Conflicts:
#	core/cva6.sv
#	core/id_stage.sv
#	core/include/build_config_pkg.sv
#	core/issue_read_operands.sv
#	core/issue_stage.sv
#	verif/core-v-verif

# Conflicts:
#	verif/env/uvme/cov/uvme_cva6_cov_model.sv
#	verif/env/uvme/uvme_cva6_cfg.sv
#	verif/env/uvme/uvme_cva6_env.sv
#	verif/env/uvme/uvme_cva6_pkg.flist
#	verif/env/uvme/uvme_cva6_vsqr.sv
#	verif/tb/uvmt/cva6_tb_wrapper.sv
#	verif/tb/uvmt/uvmt_cva6_dut_wrap.sv

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>