final merge fix