transporter model and prefabs added
cleaning conflicts