Update docs
Fix conflicts