modifying script
fixing merge