probably fixed AndroidManifest after merge (activities had switched packages)