Getting merging conflicts while synchronizing my forked repo!

[VarshneyaAmit]

Please review all recently closed/open pull requests on your end so that I can retry sync of my forked repo with original repo