[bug] Remove Merge conflict start and stop lines

[GunniBusch]

In multiple files you forgot to remove the <<<<<<< HEAD lines and the ending lines:
For example:

PBSCloudBackupModule/pbs-api-types/src/cloud/drive.rs

Line 2 in ab0e331

<<<<<<< HEAD

PBSCloudBackupModule/pbs-api-types/src/cloud/changer.rs

Line 5 in ab0e331

<<<<<<< HEAD

PBSCloudBackupModule/pbs-api-types/src/cloud/device.rs

Line 4 in ab0e331

=======

[AZComputerSolutions]

I have forward to our dev and asked him to respond there once fixed.