2.1 branch error on commit