fixed typo in docs
resolved conflict