Updated Requirements.txt Merge Conflict