Update bundle for rsync backup.
Fix merge conflict.