All tests passing
Fixed merge conflicts