merged conflicts and reordered requirements.txt