cleanup merge conflict
update MANIFEST