some stdin stuff
Fix merge