Avoid xtrabackup conflict

Change-Id: I3b78af41f6c93518ff0e3f448a59014ea8f384a6
Fix merge conflict