fix merge
docs