ceconflictresolution import + improvements in mixing identification of
peptides