repair bad merge issue from syndic fixes