Moved api docs
Fixed conflicts