Unmerged merge fix.