updating merge script