fixed issues
fixed conflict
fixed errors
fixed issues
Merge pull request #222 from ritesharora89/mybranch

Mybranch