Fixes broken merge.