all tests back to passing
merge conflict