Fixed merge scripts