Fixed another merge conflict issue.