Cleanup merge fix