made more tests pass
merged conflicts
updated merge conflicts