unstage xcuser state using git rm --cached
Merge branch 'master' of https://github.com/nikhilsrinivasan/currensy