fixed conflicts in documentation