Fixed blue fish -> manta harvester
Fixed entity file conflicts
REALLY fixed entity file conflicts