better conflict detection
fixed example
can pass in a server as well
more docs
2.0.0