Fix previous merging.