Weird merge fix.