improve merge script
improve merge script
improve merge script
improve merge script
improve merge script