resolve name collisions (buffer, flush)