Removed conflicts in checkout.css and search.php file
Merge branch 'develop' of https://github.com/priyanka-techmaes/kisanfarms into search-page
Merge pull request #128 from priyanka-techmaes/search-page

Search page