Last of the bad merge correction.