Fixing broken merge.