Final merge fix