Merge script seems to work ok.

In fact it does more then the name suggests...
Better name for merge script.