resolve Android Manifest conflict
basic
Merge pull request #6 from rpandey1234/working2

Working2