testing merge script