fixed android manifest
resolve merge conflicts like booyah