Fixes for linux backup scripts
Fix merge conflict