fix conflict
0.0.1
update manifest
0.0.2