[Fix] Conflict bug
Associated docs
No issue
Changes
- Fix a conflict bug
Change type
- Bug fix
Screenshots
Code quality
- My code follows the defined guidelines
- I have reviewed and tested my code
- My changes don't cause new warnings
- My code has relevant tests
- My unit tests are passing