Just making sure the previous merge didn't mess anything up bigtime.