conflicts samba