chore: fix merge conflicts

[Simun17]

Description

Merge conflicts

Type of change

• Bug fix (non-breaking change that fixes an issue)
• New feature (non-breaking change that adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• Documentation update
• Refactoring (improving code structure without changing external behavior)
• Other (please explain): resolved conflicts

Checklist

• I have performed a self-review of my code
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes
• My code is well documented
• I have read and understood the contribution guidelines

How Has This Been Tested?