script edit and update
merge