use rebase instead of merge in auto-update.sh
Merge branch 'autoupdate'