Updated docs
Fix conflict