- Error handling in some conflict detection/resolution scenarios was incomplete
- This patch improves error handling and reporting
- Also, reporting of misconfiguration is improved.
- Infrastructure for manual testing is added, automated testing not setup yet.