Fixed some merge errors. Spencer will want
to check comments in corner conditions for errors.