Fixed merge conflict
Merge pull request #67 from ritesharora89/profile

Fixed merge conflict