scripts updates
merge conflicts