more updates to merge script