Error getting diff: bad link: conflict in file pykolab.dsc

File plesk.password.inc.php of Package roundcubemail