Update merge script