edit in game and royalty file
ranjith conflicts resolved and merged
deletion of deduction
Merge remote-tracking branch 'upstream/master'