Local merge fix for this file