Resolve merge conflicts #531

Job	Run time
Set CI/CD metadata	8s
Commit stage / Check file format	5s
Commit stage / Check Markdown format	7s
Commit stage / Scan secrets	7s
Commit stage / Check TODO usage	5s
Commit stage / Detect Terraform Changes	4s
Commit stage / Scan dependencies	29s
Commit stage / Count lines of code	9s
Commit stage / Check English usage	7s
Commit stage / Run terraform-docs	9s
Commit stage / Lint Terraform	3s
Commit stage / Trivy Scan	3m 59s
Test stage / Unit tests	1m 19s
Test stage / Check generated dependencies	31s
Test stage / Linting	32s
Test stage / Typecheck	30s
Test stage / Perform static analysis	0s
Test stage / Test coverage	0s
Build stage	0s
Acceptance stage	0s
Publish stage	0s
	8m 24s

Provide feedback