Fix Merge scripts