Fix conflict resolution that prevented streams from being closed