beating stdio on 1-6
merging conflicts