WIP
really merge
adding uniprot update