merge script and doc changes