Delete layoyt merge fix