space saving
merging conflict
Merge branch 'master' of https://github.com/subodhvsharma/paper-NPC