Removed conflicts in develop.css
Removed conflicts in develop.css
Merge pull request #81 from priyanka-techmaes/resolved-bug

Resolved bug