update manifest
fix conflict