merge script: bring over sync1 fixes