merge docs updates