Merge conficts

All tests pass.