Added merge scripts from Andrew