merge doc changes