Fix merge script