Corrections After the Merge Today