Fixed a merging issue.