Fixed merge conflict in AndroidManifest.xml