Edited AndroidManifest
Fixed conflict