@nprofile1q... Makes sense. I never never edit requirements.txt. I have a "what am I actually using" file that looks like unpinned requirements.txt. Then use uv pip compile to generate requirements.txt. That works really well for me. Merge conflicts are very rare, can be tossed and regenerated at any time.