removed scripts
remove
conflict