resolving conflicts in requirements.txt

2 jobs for !210 with Bulk_Data_API_Impl in 41 minutes and 52 seconds (queued for 7 seconds)
latest merge request