Fix merge conflict leftover
Fix merge conflict leftover

rkorzeniewski/bacula,rkorzeniewski/bacula,rkorzeniewski/bacula,rkorzeniewski/bacula,rkorzeniewski/bacula,rkorzeniewski/bacula,rkorzeniewski/bacula,rkorzeniewski/bacula