Retry merging SugarOS/Sugarizer