removed conflicts in doc
fix test suite: 144 tests passing on OSX, 1 skipped