Fix manifest:
- add git repo
- try to avoid collision, etc