Fixed conflict in manifest.json