error rectified
Merge branch 'master' of https://github.com/mohdasif2294/Scrap_geeks
resolved conflicts