Weird double merge fix