Don't flush stdout.
Resolved conflicts.