layout work merge fix