fixed the merge script