manifest: fix conflict