resolved merge conflicts

[arghyaiitb]

Fixes

Checklist

• [ ] I have made a material change to the repo (functionality, testing, spelling, grammar)
• [ ] I have read the [Contribution Guide] and my PR follows them.
• [ ] I updated my branch with the development branch.
• [ ] I have added tests that prove my fix is effective or that my feature works
• [ ] I have added necessary documentation about the functionality in the appropriate .md file
• [ ] I have added in line documentation to the code I modified

Short description of what this PR does:

-

If you have questions, please send an email to SendGrid, or file a GitHub Issue in this repository.