Work Around Merge Conflicts in Test Execution When merge conflicts block or , locate the existing venv and run tests directly with Python, bypassing the broken or . Check venv location with , activate it, verify dependencies with , then run tests with or execute test modules directly with . This preserves test validation while avoiding conflict resolution that could affect other work. ---