Fix merge conflicts

diff --cc programs/fileio.c
Simple merge

diff --cc tests/playTests.sh
index 02fd7cdc13c122d1b2e23c124062f4063f42ec09,f3b66e349e39aa813257853d54a80099eea0cdb2..608d4228f615de9083ac9cd3624850c89af80c02
--- 1/tests/playTests.sh
--- 2/tests/playTests.sh
+++ b/tests/playTests.sh
@@@ -361,23 -368,7 +368,23 @@@ zstd tmp1.zst tmp2.zst -o "$INTOVOID" -
  zstd -d tmp1.zst tmp2.zst -o tmp
  touch tmpexists
  zstd tmp1 tmp2 -f -o tmpexists
- zstd tmp1 tmp2 -o tmpexists && die "should have refused to overwrite"
+ zstd tmp1 tmp2 -q -o tmpexists && die "should have refused to overwrite"
 +println gooder > tmp_rm1
 +println boi > tmp_rm2
 +println worldly > tmp_rm3
 +echo 'y' | zstd tmp_rm1 tmp_rm2 -o tmp_rm3.zst --rm     # tests the warning prompt for --rm with multiple inputs into once source
 +test ! -f tmp_rm1
 +test ! -f tmp_rm2
 +cp tmp_rm3.zst tmp_rm4.zst
 +echo 'Y' | zstd -d tmp_rm3.zst tmp_rm4.zst -o tmp_rm_out --rm
 +test ! -f tmp_rm3.zst
 +test ! -f tmp_rm4.zst
 +echo 'yes' | zstd tmp_rm_out tmp_rm3 -c --rm
 +test ! -f tmp_rm_out
 +test ! -f tmp_rm3
 +println gooder > tmpexists1
 +zstd tmpexists1 tmpexists -c --rm -f
 +
  # Bug: PR #972
  if [ "$?" -eq 139 ]; then
    die "should not have segfaulted"