fixed documentation bug due to conflict merge