Fixes broken merge