Fix log of errors not rendering the error message/data in the JSON renderer.
Add conflict resolve, presenting choices to the user.

This commit also contains:
- Simplified Manager and Project
- Add warning when an extraneous package is found.
- Fix a lot of bugs in the overall resolve process
- Made templates rendering synchronous
-