Quick updates to merge script