updated readme and scripts
merge resolve