resolve maven conflicts

45 jobs for 1730-uniprot-refactor in 13 minutes and 10 seconds (queued for 7 seconds)