fix: typo
fix: sonar
fix: conflicts