Fixed incorrectly resolved conflict that resulted in the "Type = internal" annotation still being set
Fixed incorrectly resolved conflict that resulted in the "Type = internal" annotation still being set

MyersResearchGroup/iBioSim,MyersResearchGroup/iBioSim,MyersResearchGroup/iBioSim