2
fix androidmanifest.xml due to merge error