Merged conflicts in test androidmanifest