merge fix with ids