updated merge_and_push.sh