fixed merge scripts