finished BaseSpider with Protein
fixing merge conflicts