updated scripts for merging