added script for merging upstream