Add merge_with_upstrea.sh