update scripts
update scripts
resolve conflict