update final script
conflict resolved