- Conflict resolution works again
- Tests compiles
- code cleanup