remove all comflit from hariom
Merge branch 'master' of https://github.com/techboy-/ncc