small changes
Fixed conflicts in AndroidManifest.xml