update merging script