add author gabriellewp in requirements.txt
resolve conflict in requirements.txt