Shubhra Pandit
Resolve .gitattributes merge conflict
3760efe