Updating AndroidManifest.xml
resolve merge conflict