merge fix 2