Updated SS-MK-1 ship
Fixed some conflicts.