Add check if blz is available for hbci
Solve merge conflict