added script to index
fixed conflicts