updated release script
fixed merging conflict