Bad merge in documentation