Edit manifest and gitignore
Resolve merge issues