merge fix 4