Add grequests to dependencies.
Fix merge conflict.