Avoid stream reuse issue
Fix merge conflict