fixed androidmanifest xml file, my merge conflict earlier was weird