merge fix 3